Fix screwup in handling of module path that was resulting in freed memory

Fri Mar 29 17:41:21 2002  Owen Taylor  <otaylor@redhat.com>

        * gtk/gtkmain.c (load_modules): Fix screwup in handling
        of module path that was resulting in freed memory being
        accessed when both GTK_MODULES and a theme were set.
        (#76902, Johan Dahlin)

diff --git a/ChangeLog b/ChangeLog
index ff84660a0be870b4c6ecf22ffebe1a62f4be5827..2bfbfff221742506fdd9c7cc6a48efd07a7cb60e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Fri Mar 29 17:41:21 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkmain.c (load_modules): Fix screwup in handling
+       of module path that was resulting in freed memory being
+       accessed when both GTK_MODULES and a theme were set.
+       (#76902, Johan Dahlin)
+
 Fri Mar 29 17:57:36 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkiconfactory.c (get_default_icons): Fix wrong

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index ff84660a0be870b4c6ecf22ffebe1a62f4be5827..2bfbfff221742506fdd9c7cc6a48efd07a7cb60e 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+Fri Mar 29 17:41:21 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkmain.c (load_modules): Fix screwup in handling
+       of module path that was resulting in freed memory being
+       accessed when both GTK_MODULES and a theme were set.
+       (#76902, Johan Dahlin)
+
 Fri Mar 29 17:57:36 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkiconfactory.c (get_default_icons): Fix wrong

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index ff84660a0be870b4c6ecf22ffebe1a62f4be5827..2bfbfff221742506fdd9c7cc6a48efd07a7cb60e 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,10 @@
+Fri Mar 29 17:41:21 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkmain.c (load_modules): Fix screwup in handling
+       of module path that was resulting in freed memory being
+       accessed when both GTK_MODULES and a theme were set.
+       (#76902, Johan Dahlin)
+
 Fri Mar 29 17:57:36 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkiconfactory.c (get_default_icons): Fix wrong

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index ff84660a0be870b4c6ecf22ffebe1a62f4be5827..2bfbfff221742506fdd9c7cc6a48efd07a7cb60e 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,10 @@
+Fri Mar 29 17:41:21 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkmain.c (load_modules): Fix screwup in handling
+       of module path that was resulting in freed memory being
+       accessed when both GTK_MODULES and a theme were set.
+       (#76902, Johan Dahlin)
+
 Fri Mar 29 17:57:36 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkiconfactory.c (get_default_icons): Fix wrong

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index ff84660a0be870b4c6ecf22ffebe1a62f4be5827..2bfbfff221742506fdd9c7cc6a48efd07a7cb60e 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+Fri Mar 29 17:41:21 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkmain.c (load_modules): Fix screwup in handling
+       of module path that was resulting in freed memory being
+       accessed when both GTK_MODULES and a theme were set.
+       (#76902, Johan Dahlin)
+
 Fri Mar 29 17:57:36 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkiconfactory.c (get_default_icons): Fix wrong

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index ff84660a0be870b4c6ecf22ffebe1a62f4be5827..2bfbfff221742506fdd9c7cc6a48efd07a7cb60e 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+Fri Mar 29 17:41:21 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkmain.c (load_modules): Fix screwup in handling
+       of module path that was resulting in freed memory being
+       accessed when both GTK_MODULES and a theme were set.
+       (#76902, Johan Dahlin)
+
 Fri Mar 29 17:57:36 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkiconfactory.c (get_default_icons): Fix wrong

diff --git a/NEWS b/NEWS
index 5cca26c03601a1647386e5ffc17961308cc8e13f..b30bdf2685cfd48f9d0474e6a7273ea7e2de8902 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -23,10 +23,10 @@ Overview of Changes in GTK+ 2.0.1
 * Misc bug fixes
 
 Other contributors: Jacob Berkman, Dennis Björklund, Seth Burgess,
-  Murray Cumming, John Elliis, Kang Jeong-He, James Henstridge, 
-  Richard Hult, Thomas Leonard, LEE Sau Dan, Alexey A. Malyshev, 
-  Mark McLoughlin, Michael Meeks,Sven Neumann, Andras Salamon, 
-  Soeren Sandmann, Dan Winship, Yao Zhang
+  Murray Cumming, Johan Dahlin, John Ellis, Kang Jeong-He, 
+  James Henstridge, Richard Hult, Thomas Leonard, LEE Sau Dan, 
+  Alexey A. Malyshev, Mark McLoughlin, Michael Meeks, Sven Neumann, 
+  Andras Salamon, Soeren Sandmann, Dan Winship, Yao Zhang
 
 Overview of Changes in GTK+ 2.0.0
 =================================

diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index 11bbe873f0eccc5572cefdd59c6c9ce09931859a..e1f494f78ebcc64c09fdd2b6fbdd86c7cfdbc610 100644 (file)
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -453,8 +453,7 @@ _gtk_find_module (const gchar *name,
 }
 
 static GModule *
-find_module (gchar      **module_path,
-            const gchar *name)
+find_module (const gchar *name)
 {
   GModule *module;
   gchar *module_name;
@@ -476,7 +475,6 @@ find_module (gchar      **module_path,
 
 static GSList *
 load_module (GSList      *gtk_modules,
-            gchar      **module_path,
             const gchar *name)
 {
   GtkModuleInitFunc modinit_func = NULL;
@@ -484,7 +482,7 @@ load_module (GSList      *gtk_modules,
   
   if (g_module_supported ())
     {
-      module = find_module (module_path, name);
+      module = find_module (name);
       if (module &&
          g_module_symbol (module, "gtk_module_init", (gpointer *) &modinit_func) &&
          modinit_func)
@@ -517,18 +515,16 @@ load_module (GSList      *gtk_modules,
 static GSList *
 load_modules (const char *module_str)
 {
-  gchar **module_path = get_module_path ();
   gchar **module_names = pango_split_file_list (module_str);
   GSList *gtk_modules = NULL;
   gint i;
   
   for (i = 0; module_names[i]; i++)
-    gtk_modules = load_module (gtk_modules, module_path, module_names[i]);
+    gtk_modules = load_module (gtk_modules, module_names[i]);
   
   gtk_modules = g_slist_reverse (gtk_modules);
   
   g_strfreev (module_names);
-  g_strfreev (module_path);
 
   return gtk_modules;
 }